Merge version 5.14.2+dfsg-6+rpi1 and 5.15.1+dfsg-2 to produce 5.15.1+dfsg-2+rpi1

diff --cc configure.json
Simple merge

diff --cc debian/changelog
index 169acc4345cefb21287f31c2e529d65dd2bf2cd1,0d8faa57680d23beba1fd45a24c697f4f947882a..86c7adf37b6f973b171c79e83cc054b30fda254d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,49 +1,59 @@@
- qtbase-opensource-src (5.14.2+dfsg-6+rpi1) bullseye-staging; urgency=medium
++qtbase-opensource-src (5.15.1+dfsg-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Aug 2020 16:27:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Nov 2020 17:21:15 +0000
++
+ qtbase-opensource-src (5.15.1+dfsg-2) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Backport upstream patch to fix multiscreen-related regression that
+     affects Plasma.
+   * Update debian/libqt5core5a.symbols from buildds’ logs.
+   * Upload to unstable.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Apply cross_build_mysql.diff to get closer to cross building on a Debian
+     environment. Thanks Helmut Grohne for the patch! (Closes: #971604).
+   * Remove qt5-default. Nowadays it's not needed as Qt 5 is the only Qt version
+     in Debian and it brought more problems than solutions.
+ 
+   [ Helmut Grohne ]
+   * qmake cross wrapper: Allow passing -qt5. (Closes: #972640)
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 28 Oct 2020 21:53:04 +0300
+ 
+ qtbase-opensource-src (5.15.1+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop all patches that have been included in the new release:
+     - CVE-2015-9541.diff
+     - CVE-2020-17507.diff
+     - CVE-2020-13962.diff
+     - enable_a11y_on_linux.diff
+     - fix_qlibrary_deadlock.diff
+     - moc_handle_includes.diff
+     - no_isystem.diff
+     - clarify_pic_message.diff
+   * Refresh other patches.
+   * Update symbols files from buildds’ logs.
+   * Update to debhelper compat level 13.
+     - Drop dh_missing override, --fail-missing is now default behavior.
+     - Use ${DEB_HOST_MULTIARCH} substitution.
+     - Stop using dh-exec for .links files, as debhelper now supports
+       substitutions natively.
+   * Bump qttools build-dependencies to 5.15.
+   * Bump ABI version to qtbase-abi-5-15-1.
+   * Update debian/copyright using debian/scripts/update-copyright.
+   * Manually update non-generated part of debian/copyright.
+   * Update install files for the new release.
+   * Update symbols files from the current build log.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Thu, 10 Sep 2020 14:41:18 +0300
  
  qtbase-opensource-src (5.14.2+dfsg-6) unstable; urgency=medium
  

diff --cc debian/patches/series
index a20a73d86e5d351e6676aaaa80f497ffcc0bb255,a30b9b86e6529ef2d2742b9916e7ae14f4a5e1f8..28f911bf0a721a5c056eb01839cdd869d786f9a1
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -19,4 -12,4 +12,5 @@@ nonlinux_utime.dif
  qdoc_default_incdirs.diff
  path_max.diff
  qstorageinfo_linux.diff
+ cross_build_mysql.diff
 +modify-configure.json-to-disable-neon.patch

diff --cc debian/rules
Simple merge